Skip to content

FIX: Input System actions not auto-saving in Project Settings when both related windows were open#2362

Merged
josepmariapujol-unity merged 19 commits intodevelopfrom
input/save-asset-input-system
Mar 5, 2026
Merged

FIX: Input System actions not auto-saving in Project Settings when both related windows were open#2362
josepmariapujol-unity merged 19 commits intodevelopfrom
input/save-asset-input-system

Conversation

@josepmariapujol-unity
Copy link
Collaborator

@josepmariapujol-unity josepmariapujol-unity commented Feb 26, 2026 •
edited
Loading

Description

This PR fixes the problem of input system actions not being saved when ProjectSettings window is opened together with InputSystem Actions window AND auto-save button is not pressed.

Related post on forums

JIRA: UUM-134035

Before:

Before.mov

After:

After.mov

HELPBOX added when both windows are opened and Input actions set to project settings wide-project:
Screenshot 2026-03-05 at 11 36 09

Testing status & QA

Double-check what is shown in the video works.

Overall Product Risks

Please rate the potential complexity and halo effect from low to high for the reviewers. Note down potential risks to specific Editor branches if any.

  • Complexity: 1
  • Halo Effect: 1

Comments to reviewers

Please describe any additional information such as what to focus on, or historical info for the reviewers.

Checklist

Before review:

  • Changelog entry added.
    • Explains the change in Changed, Fixed, Added sections.
    • For API change contains an example snippet and/or migration example.
    • JIRA ticket linked, example (case %%). If it is a private issue, just add the case ID without a link.
    • Jira port for the next release set as "Resolved".
  • Tests added/changed, if applicable.
    • Functional tests Area_CanDoX, Area_CanDoX_EvenIfYIsTheCase, Area_WhenIDoX_AndYHappens_ThisIsTheResult.
    • Performance tests.
    • Integration tests.
  • Docs for new/changed API's.
    • Xmldoc cross references are set correctly.
    • Added explanation how the API works.
    • Usage code examples added.
    • The manual is updated, if needed.

During merge:

  • Commit message for squash-merge is prefixed with one of the list:
    • NEW: ___.
    • FIX: ___.
    • DOCS: ___.
    • CHANGE: ___.
    • RELEASE: 1.1.0-preview.3.

@josepmariapujol-unity josepmariapujol-unity self-assigned this Feb 26, 2026
@josepmariapujol-unity josepmariapujol-unity marked this pull request as ready for review February 26, 2026 13:52
@u-pr
Copy link
Contributor

u-pr bot commented Feb 26, 2026 •
edited
Loading

PR Reviewer Guide 🔍

(Review updated until commit 5c2eab5)

Here are some key observations to aid the review process:

🎫 Ticket compliance analysis 🔶

UUM-134035 - Partially compliant

Compliant requirements:

  • Newly created Action Maps should be saved as sub-assets when closing the Project Settings window after editing Project-wide Input Actions.

Non-compliant requirements:

  • Behavior should match the expected auto-save behavior seen in versions where the issue is not reproducible (e.g., 1.17.0).

Requires further human verification:

  • Verify via the provided repro steps that closing the Project Settings window now persists newly created Action Maps as sub-assets (including the “both windows open” scenario mentioned in the PR description).
  • Verify expected behavior when InputEditorUserSettings.autoSaveInputActionAssets is disabled (no unintended saving).
⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪

Small diff, but it changes save-gating behavior and needs quick validation for regressions around the auto-save setting and window/focus interactions.

🏅 Score: 72

The change is minimal and likely fixes the reported scenario, but it appears to remove honoring the user auto-save setting, which could introduce an unintended behavior change.

🧪 No relevant tests
🔒 No security concerns identified
⚡ Recommended focus areas for review

Behavior Change

The early-return no longer checks InputEditorUserSettings.autoSaveInputActionAssets, which may cause assets to be saved even when auto-save is disabled; confirm that this is intended for the Project Settings workflow and doesn’t regress user expectations elsewhere.

 
private void ValidateAndSaveAsset(InputActionAsset asset)
{
    // This code should be cleaned up once we migrate the InputControl stuff from ImGUI completely.
    // Since at that point it stops being a separate window that steals focus.
    // (See case ISXB-1713)
    if (m_View.IsControlSchemeViewActive())
    {
        return;
    }
  • Update review

🤖 Helpful? Please react with 👍/👎 | Questions❓Please reach out in Slack #ask-u-pr

@u-pr
Copy link
Contributor

u-pr bot commented Feb 26, 2026 •
edited
Loading

PR Code Suggestions ✨

Latest suggestions up to 5c2eab5

Explore these optional code suggestions:

CategorySuggestion                                                                                                                                    Impact
Possible issue
Preserve the auto-save toggle

This change makes ValidateAndSaveAsset save even when the user has disabled
auto-save, which is a behavior regression and can lead to unintended asset writes.
Keep honoring InputEditorUserSettings.autoSaveInputActionAssets while still
short-circuiting when the control scheme view is active.

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs [181-184]

-if (m_View.IsControlSchemeViewActive())
+if (!InputEditorUserSettings.autoSaveInputActionAssets || m_View.IsControlSchemeViewActive())
 {
     return;
 }
Suggestion importance[1-10]: 8

__

Why: The PR removes the check for InputEditorUserSettings.autoSaveInputActionAssets, which means the editor will now auto-save even if the user has explicitly disabled that setting. This is a regression in user-facing behavior, as user preferences should be respected.

Medium
  • More suggestions

🤖 Helpful? Please react with 👍/👎 | Questions❓Please reach out in Slack #ask-u-pr

Previous suggestions

Suggestions up to commit 7e2617c
CategorySuggestion                                                                                                                                    Impact
Possible issue
Guard against null path/asset

Add guards for asset == null and string.IsNullOrEmpty(path) to avoid
NullReferenceException (e.g., when the asset is deleted/unloaded while the UI is
open). Also avoid calling AssetDatabase.GetAssetPath in the comparison when path is
null/empty and compare using StringComparison.Ordinal for consistent behavior.

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs [295-302]

 internal static bool Save(string path, InputActionAsset asset)
 {
+    if (string.IsNullOrEmpty(path) || asset == null)
+        return false;
+
     var projectWideActions = InputSystem.actions;
-    if (projectWideActions != null && path == AssetDatabase.GetAssetPath(projectWideActions))
+    var projectWidePath = projectWideActions != null ? AssetDatabase.GetAssetPath(projectWideActions) : null;
+    if (!string.IsNullOrEmpty(projectWidePath) && string.Equals(path, projectWidePath, StringComparison.Ordinal))
         ProjectWideActionsAsset.Verify(asset);
 
     return InputActionAssetManager.SaveAsset(path, asset.ToJson());
 }
Suggestion importance[1-10]: 6

__

Why: The suggestion adds necessary null guards for asset and path in the internal static Save method. This prevents a potential NullReferenceException when calling asset.ToJson() and improves the method's robustness for general usage.

Low
Suggestions up to commit 826e5a2
CategorySuggestion                                                                                                                                    Impact
Possible issue
Allow manual saves unconditionally

The control-schemes view guard makes sense for auto-save (focus-stealing), but it
will also block an explicit user-initiated save. Remove the
IsControlSchemeViewActive() early return here so the user can always save from the
toolbar.

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs [190-199]

 private void OnSaveAssetRequested()
 {
     var asset = GetAsset();
     if (asset == null)
         return;
-    if (m_View != null && m_View.IsControlSchemeViewActive())
-        return;
+
     ProjectWideActionsAsset.Verify(asset);
     EditorHelpers.SaveAsset(AssetDatabase.GetAssetPath(asset), asset.ToJson());
 }
Suggestion importance[1-10]: 7

__

Why: The m_View.IsControlSchemeViewActive() check is a workaround for ImGUI focus issues during auto-save. Including it in OnSaveAssetRequested (triggered by a manual user action) can lead to a confusing UX where the Save button click is ignored without any feedback.

Medium

@josepmariapujol-unity josepmariapujol-unity marked this pull request as draft February 26, 2026 13:55
@josepmariapujol-unity josepmariapujol-unity changed the title Input/save asset input system FIX: Input/save asset input system Mar 3, 2026
@josepmariapujol-unity josepmariapujol-unity changed the title FIX: Input/save asset input system FIX: Project-wide Input Actions are not auto-saved when closing the Project Settings window Mar 3, 2026
@josepmariapujol-unity josepmariapujol-unity changed the title FIX: Project-wide Input Actions are not auto-saved when closing the Project Settings window FIX: Project-wide Input Actions are saved/auto-saved in the Project Settings window Mar 3, 2026
@josepmariapujol-unity josepmariapujol-unity marked this pull request as ready for review March 3, 2026 12:49
@u-pr
Copy link
Contributor

u-pr bot commented Mar 3, 2026

Persistent review updated to latest commit 7e2617c

@codecov-github-com
Copy link

codecov-github-com bot commented Mar 3, 2026 •
edited
Loading

Codecov Report

Attention: Patch coverage is 42.85714% with 8 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...Editor/UITKAssetEditor/InputActionsEditorWindow.cs 50.00% 6 Missing ⚠️
...KAssetEditor/InputActionsEditorSettingsProvider.cs 0.00% 2 Missing ⚠️ 
@@             Coverage Diff             @@
##           develop    #2362      +/-   ##
===========================================
- Coverage    77.90%   77.89%   -0.02%     
===========================================
  Files          476      476              
  Lines        97613    97644      +31     
===========================================
+ Hits         76048    76061      +13     
- Misses       21565    21583      +18
Flag Coverage Δ
inputsystem_MacOS_2022.3 5.52% <0.00%> (-0.01%) ⬇️
inputsystem_MacOS_2022.3_project 75.38% <0.00%> (-0.02%) ⬇️
inputsystem_MacOS_6000.0 5.30% <0.00%> (-0.01%) ⬇️
inputsystem_MacOS_6000.0_project 77.29% <42.85%> (+<0.01%) ⬆️
inputsystem_MacOS_6000.3 5.30% <0.00%> (-0.01%) ⬇️
inputsystem_MacOS_6000.3_project 77.28% <42.85%> (-0.01%) ⬇️
inputsystem_MacOS_6000.4 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_MacOS_6000.4_project 77.30% <42.85%> (-0.01%) ⬇️
inputsystem_MacOS_6000.5 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_MacOS_6000.5_project 77.29% <42.85%> (-0.01%) ⬇️
inputsystem_MacOS_6000.6 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_MacOS_6000.6_project 77.29% <42.85%> (-0.02%) ⬇️
inputsystem_Ubuntu_2022.3_project 75.18% <0.00%> (-0.02%) ⬇️
inputsystem_Ubuntu_6000.0 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.0_project 77.09% <42.85%> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.3 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.3_project 77.09% <42.85%> (-0.02%) ⬇️
inputsystem_Ubuntu_6000.4 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.4_project 77.10% <42.85%> (-0.02%) ⬇️
inputsystem_Ubuntu_6000.5 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.5_project 77.09% <42.85%> (-0.02%) ⬇️
inputsystem_Ubuntu_6000.6 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.6_project 77.09% <42.85%> (-0.02%) ⬇️
inputsystem_Windows_2022.3 5.52% <0.00%> (-0.01%) ⬇️
inputsystem_Windows_2022.3_project 75.51% <0.00%> (-0.02%) ⬇️
inputsystem_Windows_6000.0 5.30% <0.00%> (-0.01%) ⬇️
inputsystem_Windows_6000.0_project 77.41% <42.85%> (-0.01%) ⬇️
inputsystem_Windows_6000.3 5.30% <0.00%> (-0.01%) ⬇️
inputsystem_Windows_6000.3_project 77.41% <42.85%> (-0.01%) ⬇️
inputsystem_Windows_6000.4 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Windows_6000.4_project 77.42% <42.85%> (-0.01%) ⬇️
inputsystem_Windows_6000.5 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Windows_6000.5_project 77.42% <42.85%> (-0.01%) ⬇️
inputsystem_Windows_6000.6 5.31% <0.00%> (-0.01%) ⬇️
inputsystem_Windows_6000.6_project 77.41% <42.85%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...KAssetEditor/InputActionsEditorSettingsProvider.cs 0.00% <0.00%> (ø)
...Editor/UITKAssetEditor/InputActionsEditorWindow.cs 54.52% <50.00%> (-0.13%) ⬇️

... and 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@josepmariapujol-unity
Copy link
Collaborator Author

josepmariapujol-unity commented Mar 3, 2026

This could be probably the wrong approach, since I have just realized that it is a regression from PR

@josepmariapujol-unity josepmariapujol-unity marked this pull request as draft March 3, 2026 15:14
@josepmariapujol-unity josepmariapujol-unity changed the title FIX: Project-wide Input Actions are saved/auto-saved in the Project Settings window FIX: Input System actions not auto-saving in Project Settings when both related windows were open (UUM-134035) Mar 4, 2026
@josepmariapujol-unity josepmariapujol-unity changed the title FIX: Input System actions not auto-saving in Project Settings when both related windows were open (UUM-134035) FIX: Input System actions not auto-saving in Project Settings when both related windows were open Mar 4, 2026
@josepmariapujol-unity josepmariapujol-unity marked this pull request as ready for review March 4, 2026 13:12
@u-pr
Copy link
Contributor

u-pr bot commented Mar 4, 2026

Persistent review updated to latest commit 5c2eab5

MorganHoarau
MorganHoarau approved these changes Mar 4, 2026
View reviewed changes
Copy link
Collaborator

@MorganHoarau MorganHoarau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a minor change and I don't want to block the minor change but I have a few interrogations.

@Pauliusd01

This comment was marked as resolved.

Sign in to view
@josepmariapujol-unity josepmariapujol-unity merged commit b4c80b6 into develop Mar 5, 2026
127 of 129 checks passed
@josepmariapujol-unity josepmariapujol-unity deleted the input/save-asset-input-system branch March 5, 2026 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Pauliusd01 Pauliusd01 Pauliusd01 approved these changes

@Darren-Kelly-Unity Darren-Kelly-Unity Darren-Kelly-Unity approved these changes

@MorganHoarau MorganHoarau MorganHoarau approved these changes

@ritamerkl ritamerkl Awaiting requested review from ritamerkl

Assignees

@josepmariapujol-unity josepmariapujol-unity

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@josepmariapujol-unity @Pauliusd01 @Darren-Kelly-Unity @MorganHoarau